core: Do enumerate content objects in archive-z2 repositories
authorColin Walters <walters@verbum.org>
Sun, 20 Jul 2014 16:18:09 +0000 (12:18 -0400)
committerColin Walters <walters@verbum.org>
Mon, 21 Jul 2014 11:25:51 +0000 (07:25 -0400)
Prune has worked fine on bare repositories for some time, but now that
I finally try to delete data on the server side, I notice we weren't
actually enumerating content objects =/

That caused them to not be pruned.

https://bugzilla.gnome.org/show_bug.cgi?id=733458

src/libostree/ostree-repo.c

index 583d685bb38f27c36e7eb86ca5874cf8cee2046a..1aa48e620fc3c2b71640b90fa9ecf478ec69d04b 100644 (file)
@@ -1021,7 +1021,10 @@ list_loose_objects_at (OstreeRepo             *self,
       if (!dot)
         continue;
 
-      if (strcmp (dot, ".file") == 0)
+      if ((self->mode == OSTREE_REPO_MODE_ARCHIVE_Z2
+           && strcmp (dot, ".filez") == 0) ||
+          (self->mode == OSTREE_REPO_MODE_BARE
+           && strcmp (dot, ".file") == 0))
         objtype = OSTREE_OBJECT_TYPE_FILE;
       else if (strcmp (dot, ".dirtree") == 0)
         objtype = OSTREE_OBJECT_TYPE_DIR_TREE;